Added object type definitions and updated database.

Do **NOT** merge yet. This will cause the ACP stuff to break.