-Add code behind time limit support
-Add comment on mac creation