Optimized some data types on the database