Cleaned up basic conform implementation
Moved some logic from basic conform object to entity