More abstract methods were made to optimize the code.