Keyword crud functional
Changes for consistency