Changed to hybrid package