Added support for more entities, other bug fixes