Merged migration 0005 and 0004