Adding custom function to work with our project architecture