Added new behaviour cases, added feature related code