Simplyfied the api