Adding more functionalty