Revised Fx library usage