STORM-80 - Followed the similar coding style as stormbolt