Namespace and optimization changes

• Don't use the Phoenix namespace anymore.
• Single query is now used to fetch data to prepare changesets.