Added real funcionalities