[Work in progress] Add specs