Feature/23 assert instance of