Option table and entity

MIGRATION REQUIRED!