Removed most non-direct constructor queries, refactor