Updated env, commands, schema
Merged old branch with master