Updated to follow template used in other projects