AMP-41 - Using the correct database column types