[BUGFIX] Removed duplicity and added validation