Migrated rest of the project from Q