Added some methods to reduce complexity