Added more features to library