Some refactoring, remove field Binary