Improved options to handle shapes