Refactored identifier and some stuff