Added trim support
Added strict for my schema