Added automatic keywords