Updated solution schema. Small refactoring