[REAFCTORING] Separate methods, fix fluent inerface