Added more features... :feet: