More extension capabilities + some bug fixes