Fixed representation
Updated representation construction and built-in database.