Change to module format for functionality