changed format and added some options to getters