Initial model + some various changes