Added aditional features