A bit more functionality added