Add first modules and extend specs