Improved inner logic & Added template