Improve specification related extensions