[DEV] Added new functionality #001