Updated to schema (bugfixes)