Modification on schema + some methods