Commands support added