Added reworked basic model behaviour