Completion added + Some improvements