Basic model definition
Modified API organization