Shifted responsibility, context has separate class
Added missing relation type
Added missing relation type
Introducing views