Added trim support