Extracted stuff into separate class