Added new master/slave processing, completed schemas