Removed some dependencies with reflection :)