Added more functional capabilities