Added features and strongarm