Added all specs properly now