Added keywords and some functionality